summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-04-04 02:59:57 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-04-04 02:59:57 +0200
commitd308b3a6b07e6e5ed9060aba7472b362d76a8cd0 (patch)
treef1c2e6fc0854b2e4e5c39cc5986c8b31a084cddb
parentMerge master@5428150 into git_qt-dev-plus-aosp. (diff)
parentMerge "libotautil exports libfstab header." am: 8e0821e690 (diff)
downloadandroid_bootable_recovery-d308b3a6b07e6e5ed9060aba7472b362d76a8cd0.tar
android_bootable_recovery-d308b3a6b07e6e5ed9060aba7472b362d76a8cd0.tar.gz
android_bootable_recovery-d308b3a6b07e6e5ed9060aba7472b362d76a8cd0.tar.bz2
android_bootable_recovery-d308b3a6b07e6e5ed9060aba7472b362d76a8cd0.tar.lz
android_bootable_recovery-d308b3a6b07e6e5ed9060aba7472b362d76a8cd0.tar.xz
android_bootable_recovery-d308b3a6b07e6e5ed9060aba7472b362d76a8cd0.tar.zst
android_bootable_recovery-d308b3a6b07e6e5ed9060aba7472b362d76a8cd0.zip
-rw-r--r--Android.bp3
-rw-r--r--fsck_unshare_blocks.cpp1
-rw-r--r--install/Android.bp1
-rw-r--r--otautil/Android.bp4
4 files changed, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index a44a2c625..fc8b139a2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,7 +75,6 @@ cc_defaults {
// external dependencies
"libhealthhalutils",
- "libfstab",
],
}
@@ -153,7 +152,6 @@ cc_binary {
static_libs: [
"libotautil",
- "libfstab",
],
init_rc: [
@@ -181,7 +179,6 @@ cc_binary {
static_libs: [
"libotautil",
- "libfstab",
],
init_rc: [
diff --git a/fsck_unshare_blocks.cpp b/fsck_unshare_blocks.cpp
index e74f8ba6f..0f8ffface 100644
--- a/fsck_unshare_blocks.cpp
+++ b/fsck_unshare_blocks.cpp
@@ -34,7 +34,6 @@
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android-base/unique_fd.h>
-#include <fstab/fstab.h>
#include "otautil/roots.h"
diff --git a/install/Android.bp b/install/Android.bp
index aa47990ae..095a6d027 100644
--- a/install/Android.bp
+++ b/install/Android.bp
@@ -43,7 +43,6 @@ cc_defaults {
// external dependencies
"libvintf_recovery",
"libvintf",
- "libfstab",
],
}
diff --git a/otautil/Android.bp b/otautil/Android.bp
index b4936c08b..c9ecba788 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -61,6 +61,10 @@ cc_library_static {
"libfs_mgr",
"libselinux",
],
+
+ export_static_lib_headers: [
+ "libfstab",
+ ],
},
},
}